systemvmtemplate: new 4.11.2 template and fixes by yadvr · Pull Request #2799 · apache/cloudstack

yadvr · 2018-08-13T09:47:49Z

This adds upgrade path for a new 4.11.2 systemvmtemplate that will include latest
ca certs, linux kernel and strongswan security fixes. This also adds support for XS 7.5 release.

VMware router will be rebooted based on #2794, per current config
the VRs on reboot will go through fsck checks slowing down the deployment
process by few seconds. This will ensure that fsck checks are done
on every 3rd boot of the VR. The 4 is used because 1st boot is done
during the build of systemvmtemplate appliance.

Signed-off-by: Rohit Yadav rohit.yadav@shapeblue.com

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

GitHub Issue/PRs

Screenshots (if appropriate):

How Has This Been Tested?

Checklist:

I have read the CONTRIBUTING document.
My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
Testing
I have added tests to cover my changes.
All relevant new and existing integration tests have passed.
A full integration testsuite with all test that can run on my environment has passed.

resmo

LGTM

yadvr · 2018-08-13T10:08:16Z

@blueorangutan package

blueorangutan · 2018-08-13T10:08:57Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2018-08-13T10:37:51Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2240

rafaelweingartner · 2018-08-13T16:15:40Z

engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java

+                    }
+                    // update template ID of system Vms
+                    try (PreparedStatement update_templ_id_pstmt = conn
+                            .prepareStatement("update `cloud`.`vm_instance` set vm_template_id = ? where type <> 'User' and hypervisor_type = ?");) {


Can you change the update statement to affect only the non-destroyed system VMs entries in the database. Then we preserve the history of old/deleted system VMs that were destroyed and the respective template they were using.

Will do @rafaelweingartner

rafaelweingartner · 2018-08-13T16:21:17Z

engine/schema/src/com/cloud/upgrade/dao/Upgrade41110to41120.java

+        final Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType, String>() {
+            {
+                put(Hypervisor.HypervisorType.KVM, "6019c2ed1a13669dcf334fe380c776b0");
+                put(Hypervisor.HypervisorType.XenServer, "f2245e912c856ab610d91f88c362a1f9");


Is the template already generated? I mean, how do we know the hash of the template?

I'll update the hashes soon.

We would want to build/publish the 4.11.2.0 systemvmtemplate just before RC1 is cut, so I'll keep the hashes for now and update them before RC1 is cut when we have the latest systemvmtemplates.

yadvr · 2018-08-14T07:46:04Z

@blueorangutan package

blueorangutan · 2018-08-14T07:46:58Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2018-08-14T08:31:34Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2244

DaanHoogland · 2018-08-16T07:27:25Z

systemvm/debian/opt/cloud/bin/setup/cloud-early-config

  sync
  sysctl -p

+  export TYPE=$(grep -Po 'type=\K[a-zA-Z]*' $CMDLINE)


I do not think this is an improvemnet over the very legible function used before. Even when being less code it is not as clear and it seems less relyable to me

this is about 10x-20x faster (based on time output) than the for-loop before which is why I'm using it.

patch is using TYPE, so it currently doesn't extract agent.zip on ssvm and console-proxy

You're right @fmaximus, not sure why smoketests passed. /cc @PaulAngus looks like we'll need rc2.

@fmaximus see #2855

DaanHoogland · 2018-08-16T07:29:00Z

systemvm/debian/opt/cloud/bin/setup/postinit.sh

 do
-   logger -t cloud "Starting $svc"
-   systemctl enable --no-block --now $svc
+   systemctl enable --now --no-block $svc


is the change in the order of the arguments significant?

no, I think I made all of them do --now first... does not make any difference

DaanHoogland · 2018-08-16T07:30:27Z

systemvm/debian/opt/cloud/bin/setup/router.sh

-setup_router() {
-  log_it "Setting up virtual router system vm"
+check_reboot() {
+  if [ "$HYPERVISOR" != "vmware" ]; then


We can skip this check and reboot whenever mngmt net is not available.

copy will fix, I added this as it was very specific to vmware.

I checked this check is very specific to vmware which uses the private/mgmt nic for programming VR over port 3922, therefore we don't need to do it for other hypervisors.

DaanHoogland

some style comments

wido · 2018-08-21T09:10:19Z

systemvm/debian/opt/cloud/bin/setup/common.sh

   else
-       systemctl disable --now conntrackd
-       systemctl disable --now keepalived
-       systemctl enable dnsmasq


Why do we no longer disable these services by default?

@wido it's duplicated here, we do that in the cloud-postinit service now based on the enabled/disabled svcs file. See the postinit.sh file.

Ah, ok! I couldn't see that from this change. Thanks for the feedback

yadvr · 2018-08-21T10:29:19Z

PR is on hold to receive confirmaion of the VR/vmware reboot fix from a production env, we probably can update the checksums just before RC1 cut to avoid creating a systemvmtemplate that gets outdated in next few weeks

yadvr · 2018-08-21T12:18:49Z

@blueorangutan package

blueorangutan · 2018-08-21T12:19:03Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2018-08-21T12:51:04Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2263

VMware router will be rebooted based on apache#2794, per current config the VRs on reboot will go through fsck checks slowing down the deployment process by few seconds. This will ensure that fsck checks are done on every 3rd boot of the VR. The `4` is used because 1st boot is done during the build of systemvmtemplate appliance. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

… 7.5 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

enable passive ftp by enabling nf_conntrack_helper This is change in behaviour since linux 4.7 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr · 2018-09-08T20:04:19Z

@blueorangutan package

blueorangutan · 2018-09-08T20:04:23Z

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2018-09-08T20:36:25Z

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2290

yadvr · 2018-09-08T20:43:28Z

@blueorangutan test matrix

blueorangutan · 2018-09-08T20:44:24Z

@rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

yadvr · 2018-09-10T08:50:52Z

@blueorangutan test matrix

blueorangutan · 2018-09-10T08:51:30Z

@rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

yadvr · 2018-09-10T20:49:04Z

@blueorangutan test matrix

blueorangutan · 2018-09-10T20:49:33Z

@rhtyd a Trillian-Jenkins matrix job (centos6 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2018-09-11T17:53:30Z

Trillian test result (tid-3003)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 24964 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2799-t3003-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 66 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	1101.96	test_privategw_acl.py

blueorangutan · 2018-09-11T18:33:18Z

Trillian test result (tid-3004)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 21877 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2799-t3004-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py
Smoke tests completed. 65 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestDeployVirtioSCSIVM>:teardown	`Error`	0.00	test_deploy_virtio_scsi_vm.py
test_01_scale_vm	`Error`	12.39	test_scale_vm.py

yadvr · 2018-09-11T18:34:19Z

@blueorangutan test centos7 vmware-65

blueorangutan · 2018-09-11T18:34:36Z

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + vmware-65) has been kicked to run smoke tests

blueorangutan · 2018-09-12T01:51:09Z

Trillian test result (tid-3005)
Environment: vmware-65 (x2), Advanced Networking with Mgmt server 7
Total time taken: 24486 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2799-t3005-vmware-65.zip
Intermittent failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Smoke tests completed. 66 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestDeployVirtioSCSIVM>:teardown	`Error`	0.00	test_deploy_virtio_scsi_vm.py

yadvr · 2018-09-12T08:31:11Z

All tests were ran against a new systemvmtemplate, they all LGTM.

resmo

LGTM

This fixes a regression introduced in apache#2799, by exporting $TYPE before the `patch` is called to patch/extract archives for ssvm/cpvm. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

This fixes a regression introduced in #2799, by exporting $TYPE before the `patch` is called to patch/extract archives for ssvm/cpvm. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Correção do processamento de tarifa de tipo `SNAPSHOT` quando a _snapshot_ foi removida Closes apache#2799 See merge request scclouds/scclouds!1232

yadvr added this to the 4.11.2.0 milestone Aug 13, 2018

yadvr added the component:systemvm-template label Aug 13, 2018

yadvr requested review from DaanHoogland, rafaelweingartner, resmo and wido August 13, 2018 09:48

resmo approved these changes Aug 13, 2018

View reviewed changes

yadvr changed the title ~~systemvmtemplate: don't slow VR reboot for vmware~~ systemvmtemplate: new 4.11.2 template and fixes Aug 13, 2018

rafaelweingartner reviewed Aug 13, 2018

View reviewed changes

apache deleted a comment from blueorangutan Aug 14, 2018

DaanHoogland reviewed Aug 16, 2018

View reviewed changes

DaanHoogland approved these changes Aug 16, 2018

View reviewed changes

wido reviewed Aug 21, 2018

View reviewed changes

yadvr force-pushed the systemvm-tmpl-fixes branch from 480dc7f to f36f3d0 Compare August 21, 2018 11:59

yadvr force-pushed the systemvm-tmpl-fixes branch from f36f3d0 to 5a1f25a Compare August 21, 2018 12:29

yadvr added 5 commits September 9, 2018 00:53

add upgrade path for a new 4.11.2 systemvmtemplate and support for XS…

1cf907e

… 7.5 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

optimize finding type of the systemvm, minor optimizations

adc14b1

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

address review comments

6f6e66a

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

router: reboot only if mgmt gw is not pingable on vmware

44a3227

enable passive ftp by enabling nf_conntrack_helper This is change in behaviour since linux 4.7 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr force-pushed the systemvm-tmpl-fixes branch from 5a1f25a to 44a3227 Compare September 8, 2018 19:23

update checksums based on the to-be rc1 systemvmtemplate

7b8c5de

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

apache deleted a comment from blueorangutan Sep 10, 2018

resmo approved these changes Sep 12, 2018

View reviewed changes

yadvr merged commit 5a046e2 into apache:4.11 Sep 12, 2018

smeetsr mentioned this pull request Sep 19, 2018

VR is not reachable from VM on port 8080 to get password #2854

Closed

yadvr mentioned this pull request Sep 19, 2018

systemvm: export $TYPE before patching ssvm/cpvm #2855

Merged

12 tasks

Conversation

yadvr commented Aug 13, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

GitHub Issue/PRs

Screenshots (if appropriate):

How Has This Been Tested?

Checklist:

Uh oh!

resmo left a comment

Choose a reason for hiding this comment

Uh oh!

yadvr commented Aug 13, 2018

Uh oh!

blueorangutan commented Aug 13, 2018

Uh oh!

blueorangutan commented Aug 13, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rafaelweingartner Aug 13, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yadvr commented Aug 14, 2018

Uh oh!

blueorangutan commented Aug 14, 2018

Uh oh!

blueorangutan commented Aug 14, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yadvr commented Aug 21, 2018

Uh oh!

yadvr commented Aug 21, 2018

Uh oh!

blueorangutan commented Aug 21, 2018

Uh oh!

blueorangutan commented Aug 21, 2018

Uh oh!

yadvr commented Sep 8, 2018

Uh oh!

blueorangutan commented Sep 8, 2018

Uh oh!

blueorangutan commented Sep 8, 2018

Uh oh!

yadvr commented Sep 8, 2018

yadvr commented Aug 13, 2018 •

edited

Loading

rafaelweingartner Aug 13, 2018 •

edited

Loading